bitkeeper revision 1.1108.33.34 (410e8c8d9bg1RHJ13Fqr_i-Yov0kRg)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 2 Aug 2004 18:48:45 +0000 (18:48 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Mon, 2 Aug 2004 18:48:45 +0000 (18:48 +0000)
commitfe889de8198a4246048f92e4dcdbe243005c87b3
tree04315a9d157af08ab4aa5ba1b2da05e73d4a27b0
parent4a2ea71af2678614835380230342d11ca039473c
bitkeeper revision 1.1108.33.34 (410e8c8d9bg1RHJ13Fqr_i-Yov0kRg)

fix merge botch
linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c